Change in openvpn[master]: dco_linux: extend netlink error cb with extra info
A message that is not in the archive (sent off-list or not yet received): gerrit.1734087083000.I9e27ff335d892429334137d028f8503da4e4ca5b@...2715...
Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
to review the following change.
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
dco_linux: extend netlink error cb with extra info
A netlink error may contain more specific attributes: i.e. missing attributes or missing neted objects.
Parse and print this information too.
---
M src/openvpn/dco_linux.c
1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/841/1
src/openvpn/dco_linux.c +12 -0
@@ -339,6 +339,18 @@ (char *)nla_data(tb_msg[NLMSGERR_ATTR_MSG])); } +if (tb_msg[NLMSGERR_ATTR_MISS_NEST ]) + { +msg (M_WARN ,"kernel error: missing required nesting type %u\n" , +nla_get_u32 (tb_msg[NLMSGERR_ATTR_MISS_NEST ])); + } + +if (tb_msg[NLMSGERR_ATTR_MISS_TYPE ]) + { +msg (M_WARN ,"kernel error: missing required attribute type %u\n" , +nla_get_u32 (tb_msg[NLMSGERR_ATTR_MISS_TYPE ])); + } +return NL_STOP ; }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 1
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: ordex, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/841?usp=email )
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
Patch Set 1: Code-Review-2
(1 comment)
Patchset:
PS1:
Build fail
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 1
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-Comment-Date: Fri, 13 Dec 2024 12:09:20 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, plaisthos.
ordex has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/841?usp=email )
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
Quoted 1 line
Build fail
mpff..linux headers are too old. This change requires a more modern netlink.h
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 1
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Fri, 13 Dec 2024 14:27:36 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: flichtenheld <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
to look at the new patch set (#2).
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
dco_linux: extend netlink error cb with extra info
A netlink error may contain more specific attributes: i.e. missing attributes or missing neted objects.
Parse and print this information too.
---
M src/openvpn/dco_linux.c
A src/openvpn/netlink.h
2 files changed, 390 insertions(+), 0 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/841/2
src/openvpn/dco_linux.c +16 -0
@@ -43,6 +43,10 @@#include "ssl_verify.h" #include "ovpn_dco_linux.h" +/* include bundled netlink.h as we need a relatively modern version +* defining NLMSGERR_ATTR_MISS_NEST and NLMSGERR_ATTR_MISS_TYPE +*/ +#include "netlink.h" #include <netlink/socket.h> #include <netlink/netlink.h>
@@ -339,6 +343,18 @@ (char *)nla_data(tb_msg[NLMSGERR_ATTR_MSG])); } +if (tb_msg[NLMSGERR_ATTR_MISS_NEST ]) + { +msg (M_WARN ,"kernel error: missing required nesting type %u\n" , +nla_get_u32 (tb_msg[NLMSGERR_ATTR_MISS_NEST ])); + } + +if (tb_msg[NLMSGERR_ATTR_MISS_TYPE ]) + { +msg (M_WARN ,"kernel error: missing required attribute type %u\n" , +nla_get_u32 (tb_msg[NLMSGERR_ATTR_MISS_TYPE ])); + } +return NL_STOP ; }
src/openvpn/netlink.h new file +374 -0
374 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 2
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
to look at the new patch set (#3).
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
dco_linux: extend netlink error cb with extra info
A netlink error may contain more specific attributes: i.e. missing attributes or missing neted objects.
Parse and print this information too.
---
M src/openvpn/dco_linux.c
A src/openvpn/netlink.h
2 files changed, 394 insertions(+), 0 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/841/3
src/openvpn/dco_linux.c +20 -0
@@ -29,6 +29,14 @@#include "syshead.h" +/* include bundled netlink.h as we need a relatively modern version +* defining NLMSGERR_ATTR_MISS_NEST and NLMSGERR_ATTR_MISS_TYPE. +* +* Include it first to make sure that nobody else pulls in the system +* copy. +*/ +#include "netlink.h" +#include "dco_linux.h" #include "errlevel.h" #include "buffer.h"
@@ -339,6 +347,18 @@ (char *)nla_data(tb_msg[NLMSGERR_ATTR_MSG])); } +if (tb_msg[NLMSGERR_ATTR_MISS_NEST ]) + { +msg (M_WARN ,"kernel error: missing required nesting type %u\n" , +nla_get_u32 (tb_msg[NLMSGERR_ATTR_MISS_NEST ])); + } + +if (tb_msg[NLMSGERR_ATTR_MISS_TYPE ]) + { +msg (M_WARN ,"kernel error: missing required attribute type %u\n" , +nla_get_u32 (tb_msg[NLMSGERR_ATTR_MISS_TYPE ])); + } +return NL_STOP ; }
src/openvpn/netlink.h new file +374 -0
374 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 3
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
to look at the new patch set (#4).
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
dco_linux: extend netlink error cb with extra info
A netlink error may contain more specific attributes: i.e. missing attributes or missing neted objects.
Parse and print this information too.
---
M src/openvpn/Makefile.am
M src/openvpn/dco_linux.c
A src/openvpn/netlink.h
3 files changed, 395 insertions(+), 0 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/841/4
src/openvpn/Makefile.am +1 -0
@@ -79,6 +79,7 @@ mbuf.c mbuf.h \ memdbg.h \ misc.c misc.h \ + netlink.h \ ovpn_dco_freebsd.h \ ovpn_dco_linux.h \ ovpn_dco_win.h \
src/openvpn/dco_linux.c +20 -0
@@ -29,6 +29,14 @@#include "syshead.h" +/* include bundled netlink.h as we need a relatively modern version +* defining NLMSGERR_ATTR_MISS_NEST and NLMSGERR_ATTR_MISS_TYPE. +* +* Include it first to make sure that nobody else pulls in the system +* copy. +*/ +#include "netlink.h" +#include "dco_linux.h" #include "errlevel.h" #include "buffer.h"
@@ -339,6 +347,18 @@ (char *)nla_data(tb_msg[NLMSGERR_ATTR_MSG])); } +if (tb_msg[NLMSGERR_ATTR_MISS_NEST ]) + { +msg (M_WARN ,"kernel error: missing required nesting type %u\n" , +nla_get_u32 (tb_msg[NLMSGERR_ATTR_MISS_NEST ])); + } + +if (tb_msg[NLMSGERR_ATTR_MISS_TYPE ]) + { +msg (M_WARN ,"kernel error: missing required attribute type %u\n" , +nla_get_u32 (tb_msg[NLMSGERR_ATTR_MISS_TYPE ])); + } +return NL_STOP ; }
src/openvpn/netlink.h new file +374 -0
374 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 4
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
to look at the new patch set (#5).
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
dco_linux: extend netlink error cb with extra info
A netlink error may contain more specific attributes: i.e. missing attributes or missing neted objects.
Parse and print this information too.
---
M dev-tools/special-files.lst
M src/openvpn/Makefile.am
M src/openvpn/dco_linux.c
A src/openvpn/netlink.h
4 files changed, 396 insertions(+), 0 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/841/5
dev-tools/special-files.lst +1 -0
@@ -3,3 +3,4 @@ E:src/compat/compat-lz4.h # Preserve LZ4 upstream formatting E:src/openvpn/ovpn_dco_linux.h # Preserve ovpn-dco upstream formatting E:src/openvpn/ovpn_dco_win.h # Preserve ovpn-dco-win upstream formatting +E:src/openvpn/netlink.h # Preserve netlink.h upstream formatting
src/openvpn/Makefile.am +1 -0
@@ -79,6 +79,7 @@ mbuf.c mbuf.h \ memdbg.h \ misc.c misc.h \ + netlink.h \ ovpn_dco_freebsd.h \ ovpn_dco_linux.h \ ovpn_dco_win.h \
src/openvpn/dco_linux.c +20 -0
@@ -29,6 +29,14 @@#include "syshead.h" +/* include bundled netlink.h as we need a relatively modern version +* defining NLMSGERR_ATTR_MISS_NEST and NLMSGERR_ATTR_MISS_TYPE. +* +* Include it first to make sure that nobody else pulls in the system +* copy. +*/ +#include "netlink.h" +#include "dco_linux.h" #include "errlevel.h" #include "buffer.h"
@@ -339,6 +347,18 @@ (char *)nla_data(tb_msg[NLMSGERR_ATTR_MSG])); } +if (tb_msg[NLMSGERR_ATTR_MISS_NEST ]) + { +msg (M_WARN ,"kernel error: missing required nesting type %u\n" , +nla_get_u32 (tb_msg[NLMSGERR_ATTR_MISS_NEST ])); + } + +if (tb_msg[NLMSGERR_ATTR_MISS_TYPE ]) + { +msg (M_WARN ,"kernel error: missing required attribute type %u\n" , +nla_get_u32 (tb_msg[NLMSGERR_ATTR_MISS_TYPE ])); + } +return NL_STOP ; }
src/openvpn/netlink.h new file +374 -0
374 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 5
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, ordex.
plaisthos has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/841?usp=email )
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
Patch Set 5:
(1 comment)
File src/openvpn/dco_linux.c:
http://gerrit.openvpn.net/c/openvpn/+/841/comment/320d4cc7_2381270f :
PS5, Line 34: *
I think for two constant including a whole system header is really not great.
I would rather see just having a copy of enum nlmsgerr_attrs {, maybe as enum ovpn_nlmsgerr_attrs { included in its own small snippet with the comments rather than having this big header added to our repo.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 5
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-Comment-Date: Sun, 26 Jan 2025 09:31:40 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, ordex.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
to look at the new patch set (#6).
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
dco_linux: extend netlink error cb with extra info
A netlink error may contain more specific attributes: i.e. missing attributes or missing neted objects.
Parse and print this information too.
Note that we are re-defining some enum entries that exist in netlink.h starting with linux-6.1.
Since we do support distros not shipping an up-to-date netlink.h, we had to re-define the entries we need for this patch.
---
M src/openvpn/Makefile.am
M src/openvpn/dco_linux.c
2 files changed, 36 insertions(+), 4 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/841/6
src/openvpn/Makefile.am +1 -0
@@ -79,6 +79,7 @@ mbuf.c mbuf.h \ memdbg.h \ misc.c misc.h \ + netlink.h \ ovpn_dco_freebsd.h \ ovpn_dco_linux.h \ ovpn_dco_win.h \
src/openvpn/dco_linux.c +35 -4
@@ -291,6 +291,25 @@return NL_SKIP ; } +/* The following enum members exist in netlink.h since linux-6.1. +* However, some distro we support still ship an old header, thus +* failing the OpenVPN compilation. +* +* For the time being we add the needed defines manually. +* We will drop this definition once we stop supporting those old +* distros. +* +* @NLMSGERR_ATTR_MISS_TYPE: type of a missing required attribute, +* %NLMSGERR_ATTR_MISS_NEST will not be present if the attribute was +* missing at the message level +* @NLMSGERR_ATTR_MISS_NEST: offset of the nest where attribute was missing +*/ +enum ovpn_nlmsgerr_attrs { +OVPN_NLMSGERR_ATTR_MISS_TYPE =5 , +OVPN_NLMSGERR_ATTR_MISS_NEST =6 , +OVPN_NLMSGERR_ATTR_MAX =6 , +}; +/* This function is used as error callback on the netlink socket. * When something goes wrong and the kernel returns an error, this function is * invoked.
@@ -331,12 +350,24 @@ len -= ack_len;nla_parse (tb_msg,NLMSGERR_ATTR_MAX , attrs, len,NULL ); -if (tb_msg[NLMSGERR_ATTR_MSG ]) +if (tb_msg[OVPN_NLMSGERR_ATTR_MSG ]) { - len =strnlen ((char *)nla_data (tb_msg[NLMSGERR_ATTR_MSG ]), -nla_len (tb_msg[NLMSGERR_ATTR_MSG ])); + len =strnlen ((char *)nla_data (tb_msg[OVPN_NLMSGERR_ATTR_MSG ]), +nla_len (tb_msg[OVPN_NLMSGERR_ATTR_MSG ]));msg (M_WARN ,"kernel error: %*s\n" , len, - (char *)nla_data (tb_msg[NLMSGERR_ATTR_MSG ])); + (char *)nla_data (tb_msg[OVPN_NLMSGERR_ATTR_MSG ])); + } + +if (tb_msg[OVPN_NLMSGERR_ATTR_MISS_NEST ]) + { +msg (M_WARN ,"kernel error: missing required nesting type %u\n" , +nla_get_u32 (tb_msg[OVPN_NLMSGERR_ATTR_MISS_NEST ])); + } + +if (tb_msg[OVPN_NLMSGERR_ATTR_MISS_TYPE ]) + { +msg (M_WARN ,"kernel error: missing required attribute type %u\n" , +nla_get_u32 (tb_msg[OVPN_NLMSGERR_ATTR_MISS_TYPE ])); }return NL_STOP ;
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 6
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, ordex.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
to look at the new patch set (#7).
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
dco_linux: extend netlink error cb with extra info
A netlink error may contain more specific attributes: i.e. missing attributes or missing neted objects.
Parse and print this information too.
Note that we are re-defining some enum entries that exist in netlink.h starting with linux-6.1.
Since we do support distros not shipping an up-to-date netlink.h, we had to re-define the entries we need for this patch.
---
M src/openvpn/dco_linux.c
1 file changed, 35 insertions(+), 4 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/841/7
src/openvpn/dco_linux.c +35 -4
@@ -291,6 +291,25 @@return NL_SKIP ; } +/* The following enum members exist in netlink.h since linux-6.1. +* However, some distro we support still ship an old header, thus +* failing the OpenVPN compilation. +* +* For the time being we add the needed defines manually. +* We will drop this definition once we stop supporting those old +* distros. +* +* @NLMSGERR_ATTR_MISS_TYPE: type of a missing required attribute, +* %NLMSGERR_ATTR_MISS_NEST will not be present if the attribute was +* missing at the message level +* @NLMSGERR_ATTR_MISS_NEST: offset of the nest where attribute was missing +*/ +enum ovpn_nlmsgerr_attrs { +OVPN_NLMSGERR_ATTR_MISS_TYPE =5 , +OVPN_NLMSGERR_ATTR_MISS_NEST =6 , +OVPN_NLMSGERR_ATTR_MAX =6 , +}; +/* This function is used as error callback on the netlink socket. * When something goes wrong and the kernel returns an error, this function is * invoked.
@@ -331,12 +350,24 @@ len -= ack_len;nla_parse (tb_msg,NLMSGERR_ATTR_MAX , attrs, len,NULL ); -if (tb_msg[NLMSGERR_ATTR_MSG ]) +if (tb_msg[OVPN_NLMSGERR_ATTR_MSG ]) { - len =strnlen ((char *)nla_data (tb_msg[NLMSGERR_ATTR_MSG ]), -nla_len (tb_msg[NLMSGERR_ATTR_MSG ])); + len =strnlen ((char *)nla_data (tb_msg[OVPN_NLMSGERR_ATTR_MSG ]), +nla_len (tb_msg[OVPN_NLMSGERR_ATTR_MSG ]));msg (M_WARN ,"kernel error: %*s\n" , len, - (char *)nla_data (tb_msg[NLMSGERR_ATTR_MSG ])); + (char *)nla_data (tb_msg[OVPN_NLMSGERR_ATTR_MSG ])); + } + +if (tb_msg[OVPN_NLMSGERR_ATTR_MISS_NEST ]) + { +msg (M_WARN ,"kernel error: missing required nesting type %u\n" , +nla_get_u32 (tb_msg[OVPN_NLMSGERR_ATTR_MISS_NEST ])); + } + +if (tb_msg[OVPN_NLMSGERR_ATTR_MISS_TYPE ]) + { +msg (M_WARN ,"kernel error: missing required attribute type %u\n" , +nla_get_u32 (tb_msg[OVPN_NLMSGERR_ATTR_MISS_TYPE ])); }return NL_STOP ;
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 7
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, ordex.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
to look at the new patch set (#8).
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
dco_linux: extend netlink error cb with extra info
A netlink error may contain more specific attributes: i.e. missing attributes or missing neted objects.
Parse and print this information too.
Note that we are re-defining some enum entries that exist in netlink.h starting with linux-6.1.
Since we do support distros not shipping an up-to-date netlink.h, we had to re-define the entries we need for this patch.
---
M src/openvpn/dco_linux.c
1 file changed, 32 insertions(+), 1 deletion(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/841/8
src/openvpn/dco_linux.c +32 -1
@@ -291,6 +291,25 @@return NL_SKIP ; } +/* The following enum members exist in netlink.h since linux-6.1. +* However, some distro we support still ship an old header, thus +* failing the OpenVPN compilation. +* +* For the time being we add the needed defines manually. +* We will drop this definition once we stop supporting those old +* distros. +* +* @NLMSGERR_ATTR_MISS_TYPE: type of a missing required attribute, +* %NLMSGERR_ATTR_MISS_NEST will not be present if the attribute was +* missing at the message level +* @NLMSGERR_ATTR_MISS_NEST: offset of the nest where attribute was missing +*/ +enum ovpn_nlmsgerr_attrs { +OVPN_NLMSGERR_ATTR_MISS_TYPE =5 , +OVPN_NLMSGERR_ATTR_MISS_NEST =6 , +OVPN_NLMSGERR_ATTR_MAX =6 , +}; +/* This function is used as error callback on the netlink socket. * When something goes wrong and the kernel returns an error, this function is * invoked.
@@ -330,7 +349,7 @@ attrs = (void *)((unsigned char *)nlh + ack_len); len -= ack_len; -nla_parse (tb_msg,NLMSGERR_ATTR_MAX , attrs, len,NULL ); +nla_parse (tb_msg,OVPN_NLMSGERR_ATTR_MAX , attrs, len,NULL );if (tb_msg[NLMSGERR_ATTR_MSG ]) { len = strnlen((char *)nla_data(tb_msg[NLMSGERR_ATTR_MSG]),
@@ -339,6 +358,18 @@ (char *)nla_data(tb_msg[NLMSGERR_ATTR_MSG])); } +if (tb_msg[OVPN_NLMSGERR_ATTR_MISS_NEST ]) + { +msg (M_WARN ,"kernel error: missing required nesting type %u\n" , +nla_get_u32 (tb_msg[OVPN_NLMSGERR_ATTR_MISS_NEST ])); + } + +if (tb_msg[OVPN_NLMSGERR_ATTR_MISS_TYPE ]) + { +msg (M_WARN ,"kernel error: missing required attribute type %u\n" , +nla_get_u32 (tb_msg[OVPN_NLMSGERR_ATTR_MISS_TYPE ])); + } +return NL_STOP ; }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 8
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: ordex, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/841?usp=email )
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
Patch Set 8: Code-Review+2
(1 comment)
File src/openvpn/dco_linux.c:
http://gerrit.openvpn.net/c/openvpn/+/841/comment/1fca4d6f_43d93db1 :
PS5, Line 34: *
Quoted 1 line
I think for two constant including a whole system header is really not great. […]
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 8
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-Comment-Date: Mon, 27 Jan 2025 12:07:46 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: plaisthos <[email protected]...>
Gerrit-MessageType: comment
PATCH v8 1/1 dco_linux: extend netlink error cb with extra info
In reply to a message not in the archiveFrom: Antonio Quartulli <[email protected]...>
A netlink error may contain more specific attributes: i.e. missing attributes or missing neted objects.
Parse and print this information too.
Note that we are re-defining some enum entries that exist in netlink.h starting with linux-6.1.
Since we do support distros not shipping an up-to-date netlink.h, we had to re-define the entries we need for this patch.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/841
This mail reflects revision 8 of this Change.
Acked-by according to Gerrit (reflected above):
Frank Lichtenheld <[email protected]...>
src/openvpn/dco_linux.c +32 -1
@@ -291,6 +291,25 @@return NL_SKIP ; } +/* The following enum members exist in netlink.h since linux-6.1. +* However, some distro we support still ship an old header, thus +* failing the OpenVPN compilation. +* +* For the time being we add the needed defines manually. +* We will drop this definition once we stop supporting those old +* distros. +* +* @NLMSGERR_ATTR_MISS_TYPE: type of a missing required attribute, +* %NLMSGERR_ATTR_MISS_NEST will not be present if the attribute was +* missing at the message level +* @NLMSGERR_ATTR_MISS_NEST: offset of the nest where attribute was missing +*/ +enum ovpn_nlmsgerr_attrs { +OVPN_NLMSGERR_ATTR_MISS_TYPE =5 , +OVPN_NLMSGERR_ATTR_MISS_NEST =6 , +OVPN_NLMSGERR_ATTR_MAX =6 , +}; +/* This function is used as error callback on the netlink socket. * When something goes wrong and the kernel returns an error, this function is * invoked.
@@ -330,7 +349,7 @@ attrs = (void *)((unsigned char *)nlh + ack_len); len -= ack_len; -nla_parse (tb_msg,NLMSGERR_ATTR_MAX , attrs, len,NULL ); +nla_parse (tb_msg,OVPN_NLMSGERR_ATTR_MAX , attrs, len,NULL );if (tb_msg[NLMSGERR_ATTR_MSG ]) { len = strnlen((char *)nla_data(tb_msg[NLMSGERR_ATTR_MSG]),
@@ -339,6 +358,18 @@ (char *)nla_data(tb_msg[NLMSGERR_ATTR_MSG])); } +if (tb_msg[OVPN_NLMSGERR_ATTR_MISS_NEST ]) + { +msg (M_WARN ,"kernel error: missing required nesting type %u\n" , +nla_get_u32 (tb_msg[OVPN_NLMSGERR_ATTR_MISS_NEST ])); + } + +if (tb_msg[OVPN_NLMSGERR_ATTR_MISS_TYPE ]) + { +msg (M_WARN ,"kernel error: missing required attribute type %u\n" , +nla_get_u32 (tb_msg[OVPN_NLMSGERR_ATTR_MISS_TYPE ])); + } +return NL_STOP ; }
Attention is currently required from: ordex, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/841?usp=email )
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
Patch Set 8: Code-Review-1
(1 comment)
File src/openvpn/dco_linux.c:
http://gerrit.openvpn.net/c/openvpn/+/841/comment/edb75b53_96d7e39b :
PS8, Line 326: NLMSGERR_ATTR_MAXOVPN_NLMSGERR_ATTR_MAX
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 8
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-Comment-Date: Mon, 27 Jan 2025 15:41:57 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, ordex, plaisthos.
cron2 has removed a vote from this change. ( http://gerrit.openvpn.net/c/openvpn/+/841?usp=email )
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
Removed Code-Review-1 by flichtenheld <[email protected]...>
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 8
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-MessageType: deleteVote
Attention is currently required from: flichtenheld, ordex, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/841?usp=email )
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
Patch Set 8: Code-Review-2
(1 comment)
Patchset:
PS8:
fails ubuntu
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 8
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-Comment-Date: Mon, 27 Jan 2025 15:47:16 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, ordex, plaisthos.
Hello cron2, flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
to look at the new patch set (#9).
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
dco_linux: extend netlink error cb with extra info
A netlink error may contain more specific attributes: i.e. missing attributes or missing neted objects.
Parse and print this information too.
Note that we are re-defining some enum entries that exist in netlink.h starting with linux-6.1.
Since we do support distros not shipping an up-to-date netlink.h, we had to re-define the entries we need for this patch.
---
M src/openvpn/dco_linux.c
1 file changed, 33 insertions(+), 2 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/841/9
src/openvpn/dco_linux.c +33 -2
@@ -291,6 +291,25 @@return NL_SKIP ; } +/* The following enum members exist in netlink.h since linux-6.1. +* However, some distro we support still ship an old header, thus +* failing the OpenVPN compilation. +* +* For the time being we add the needed defines manually. +* We will drop this definition once we stop supporting those old +* distros. +* +* @NLMSGERR_ATTR_MISS_TYPE: type of a missing required attribute, +* %NLMSGERR_ATTR_MISS_NEST will not be present if the attribute was +* missing at the message level +* @NLMSGERR_ATTR_MISS_NEST: offset of the nest where attribute was missing +*/ +enum ovpn_nlmsgerr_attrs { +OVPN_NLMSGERR_ATTR_MISS_TYPE =5 , +OVPN_NLMSGERR_ATTR_MISS_NEST =6 , +OVPN_NLMSGERR_ATTR_MAX =6 , +}; +/* This function is used as error callback on the netlink socket. * When something goes wrong and the kernel returns an error, this function is * invoked.
@@ -304,7 +323,7 @@ struct nlmsgerr *err, void *arg) { struct nlmsghdr *nlh = (struct nlmsghdr *)err - 1; -struct nlattr *tb_msg[NLMSGERR_ATTR_MAX +1 ]; +struct nlattr *tb_msg[OVPN_NLMSGERR_ATTR_MAX +1 ];int len = nlh->nlmsg_len;struct nlattr *attrs;int *ret = arg;
@@ -330,7 +349,7 @@ attrs = (void *)((unsigned char *)nlh + ack_len); len -= ack_len; -nla_parse (tb_msg,NLMSGERR_ATTR_MAX , attrs, len,NULL ); +nla_parse (tb_msg,OVPN_NLMSGERR_ATTR_MAX , attrs, len,NULL );if (tb_msg[NLMSGERR_ATTR_MSG ]) { len = strnlen((char *)nla_data(tb_msg[NLMSGERR_ATTR_MSG]),
@@ -339,6 +358,18 @@ (char *)nla_data(tb_msg[NLMSGERR_ATTR_MSG])); } +if (tb_msg[OVPN_NLMSGERR_ATTR_MISS_NEST ]) + { +msg (M_WARN ,"kernel error: missing required nesting type %u\n" , +nla_get_u32 (tb_msg[OVPN_NLMSGERR_ATTR_MISS_NEST ])); + } + +if (tb_msg[OVPN_NLMSGERR_ATTR_MISS_TYPE ]) + { +msg (M_WARN ,"kernel error: missing required attribute type %u\n" , +nla_get_u32 (tb_msg[OVPN_NLMSGERR_ATTR_MISS_TYPE ])); + } +return NL_STOP ; }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 9
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: cron2, flichtenheld, plaisthos.
ordex has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/841?usp=email )
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
Patch Set 9:
(2 comments)
Patchset:
PS8:
Quoted 1 line
fails ubuntu
Resolved. it was cause by the wrong usage of NLMSGERR_ATTR_MAX
File src/openvpn/dco_linux.c:
http://gerrit.openvpn.net/c/openvpn/+/841/comment/dd60b9ff_e7825d8a :
PS8, Line 326: NLMSGERR_ATTR_MAX
Quoted 1 line
OVPN_NLMSGERR_ATTR_MAX
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 9
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 28 Jan 2025 09:00:53 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: cron2 <[email protected]...>
Comment-In-Reply-To: flichtenheld <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: cron2, ordex, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/841?usp=email )
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
Patch Set 9: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 9
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-Comment-Date: Tue, 28 Jan 2025 12:30:11 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: ordex, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/841?usp=email )
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
Patch Set 9: -Code-Review
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 9
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-Comment-Date: Tue, 28 Jan 2025 13:44:36 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v9 1/1 dco_linux: extend netlink error cb with extra info
In reply to a message not in the archiveFrom: Antonio Quartulli <[email protected]...>
A netlink error may contain more specific attributes: i.e. missing attributes or missing neted objects.
Parse and print this information too.
Note that we are re-defining some enum entries that exist in netlink.h starting with linux-6.1.
Since we do support distros not shipping an up-to-date netlink.h, we had to re-define the entries we need for this patch.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/841
This mail reflects revision 9 of this Change.
Acked-by according to Gerrit (reflected above):
Frank Lichtenheld <[email protected]...>
src/openvpn/dco_linux.c +33 -2
@@ -291,6 +291,25 @@return NL_SKIP ; } +/* The following enum members exist in netlink.h since linux-6.1. +* However, some distro we support still ship an old header, thus +* failing the OpenVPN compilation. +* +* For the time being we add the needed defines manually. +* We will drop this definition once we stop supporting those old +* distros. +* +* @NLMSGERR_ATTR_MISS_TYPE: type of a missing required attribute, +* %NLMSGERR_ATTR_MISS_NEST will not be present if the attribute was +* missing at the message level +* @NLMSGERR_ATTR_MISS_NEST: offset of the nest where attribute was missing +*/ +enum ovpn_nlmsgerr_attrs { +OVPN_NLMSGERR_ATTR_MISS_TYPE =5 , +OVPN_NLMSGERR_ATTR_MISS_NEST =6 , +OVPN_NLMSGERR_ATTR_MAX =6 , +}; +/* This function is used as error callback on the netlink socket. * When something goes wrong and the kernel returns an error, this function is * invoked.
@@ -304,7 +323,7 @@ struct nlmsgerr *err, void *arg) { struct nlmsghdr *nlh = (struct nlmsghdr *)err - 1; -struct nlattr *tb_msg[NLMSGERR_ATTR_MAX +1 ]; +struct nlattr *tb_msg[OVPN_NLMSGERR_ATTR_MAX +1 ];int len = nlh->nlmsg_len;struct nlattr *attrs;int *ret = arg;
@@ -330,7 +349,7 @@ attrs = (void *)((unsigned char *)nlh + ack_len); len -= ack_len; -nla_parse (tb_msg,NLMSGERR_ATTR_MAX , attrs, len,NULL ); +nla_parse (tb_msg,OVPN_NLMSGERR_ATTR_MAX , attrs, len,NULL );if (tb_msg[NLMSGERR_ATTR_MSG ]) { len = strnlen((char *)nla_data(tb_msg[NLMSGERR_ATTR_MSG]),
@@ -339,6 +358,18 @@ (char *)nla_data(tb_msg[NLMSGERR_ATTR_MSG])); } +if (tb_msg[OVPN_NLMSGERR_ATTR_MISS_NEST ]) + { +msg (M_WARN ,"kernel error: missing required nesting type %u\n" , +nla_get_u32 (tb_msg[OVPN_NLMSGERR_ATTR_MISS_NEST ])); + } + +if (tb_msg[OVPN_NLMSGERR_ATTR_MISS_TYPE ]) + { +msg (M_WARN ,"kernel error: missing required attribute type %u\n" , +nla_get_u32 (tb_msg[OVPN_NLMSGERR_ATTR_MISS_TYPE ])); + } +return NL_STOP ; }
[Openvpn-devel] [PATCH applied] Re: dco_linux: extend netlink error cb with extra info
Straight and to the point, after some initial complications due to older Linux distributions... v9 looks good to me, comes from the Netlink master, and both BB and GHA claim "it's not failing anything"
Your patch has been applied to the master branch.
commit edad5fa42bff2f291d7d416ccb90f4e7cd5b3f39
Author: Antonio Quartulli Date: Tue Jan 28 14:44:54 2025 +0100
dco_linux: extend netlink error cb with extra info
Signed-off-by: Antonio Quartulli <[email protected]...>
Acked-by: Frank Lichtenheld <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg30658.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#10) to the change originally created by ordex. ( http://gerrit.openvpn.net/c/openvpn/+/841?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by flichtenheld
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
dco_linux: extend netlink error cb with extra info
A netlink error may contain more specific attributes: i.e. missing attributes or missing neted objects.
Parse and print this information too.
Note that we are re-defining some enum entries that exist in netlink.h starting with linux-6.1.
Since we do support distros not shipping an up-to-date netlink.h, we had to re-define the entries we need for this patch.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg30658.html
---
M src/openvpn/dco_linux.c
1 file changed, 33 insertions(+), 2 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/841/10
src/openvpn/dco_linux.c +33 -2
@@ -291,6 +291,25 @@return NL_SKIP ; } +/* The following enum members exist in netlink.h since linux-6.1. +* However, some distro we support still ship an old header, thus +* failing the OpenVPN compilation. +* +* For the time being we add the needed defines manually. +* We will drop this definition once we stop supporting those old +* distros. +* +* @NLMSGERR_ATTR_MISS_TYPE: type of a missing required attribute, +* %NLMSGERR_ATTR_MISS_NEST will not be present if the attribute was +* missing at the message level +* @NLMSGERR_ATTR_MISS_NEST: offset of the nest where attribute was missing +*/ +enum ovpn_nlmsgerr_attrs { +OVPN_NLMSGERR_ATTR_MISS_TYPE =5 , +OVPN_NLMSGERR_ATTR_MISS_NEST =6 , +OVPN_NLMSGERR_ATTR_MAX =6 , +}; +/* This function is used as error callback on the netlink socket. * When something goes wrong and the kernel returns an error, this function is * invoked.
@@ -304,7 +323,7 @@ struct nlmsgerr *err, void *arg) { struct nlmsghdr *nlh = (struct nlmsghdr *)err - 1; -struct nlattr *tb_msg[NLMSGERR_ATTR_MAX +1 ]; +struct nlattr *tb_msg[OVPN_NLMSGERR_ATTR_MAX +1 ];int len = nlh->nlmsg_len;struct nlattr *attrs;int *ret = arg;
@@ -330,7 +349,7 @@ attrs = (void *)((unsigned char *)nlh + ack_len); len -= ack_len; -nla_parse (tb_msg,NLMSGERR_ATTR_MAX , attrs, len,NULL ); +nla_parse (tb_msg,OVPN_NLMSGERR_ATTR_MAX , attrs, len,NULL );if (tb_msg[NLMSGERR_ATTR_MSG ]) { len = strnlen((char *)nla_data(tb_msg[NLMSGERR_ATTR_MSG]),
@@ -339,6 +358,18 @@ (char *)nla_data(tb_msg[NLMSGERR_ATTR_MSG])); } +if (tb_msg[OVPN_NLMSGERR_ATTR_MISS_NEST ]) + { +msg (M_WARN ,"kernel error: missing required nesting type %u\n" , +nla_get_u32 (tb_msg[OVPN_NLMSGERR_ATTR_MISS_NEST ])); + } + +if (tb_msg[OVPN_NLMSGERR_ATTR_MISS_TYPE ]) + { +msg (M_WARN ,"kernel error: missing required attribute type %u\n" , +nla_get_u32 (tb_msg[OVPN_NLMSGERR_ATTR_MISS_TYPE ])); + } +return NL_STOP ; }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 10
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/841?usp=email )
Change subject: dco_linux: extend netlink error cb with extra info
......................................................................
dco_linux: extend netlink error cb with extra info
A netlink error may contain more specific attributes: i.e. missing attributes or missing neted objects.
Parse and print this information too.
Note that we are re-defining some enum entries that exist in netlink.h starting with linux-6.1.
Since we do support distros not shipping an up-to-date netlink.h, we had to re-define the entries we need for this patch.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg30658.html
---
M src/openvpn/dco_linux.c
1 file changed, 33 insertions(+), 2 deletions(-)
src/openvpn/dco_linux.c +33 -2
@@ -291,6 +291,25 @@return NL_SKIP ; } +/* The following enum members exist in netlink.h since linux-6.1. +* However, some distro we support still ship an old header, thus +* failing the OpenVPN compilation. +* +* For the time being we add the needed defines manually. +* We will drop this definition once we stop supporting those old +* distros. +* +* @NLMSGERR_ATTR_MISS_TYPE: type of a missing required attribute, +* %NLMSGERR_ATTR_MISS_NEST will not be present if the attribute was +* missing at the message level +* @NLMSGERR_ATTR_MISS_NEST: offset of the nest where attribute was missing +*/ +enum ovpn_nlmsgerr_attrs { +OVPN_NLMSGERR_ATTR_MISS_TYPE =5 , +OVPN_NLMSGERR_ATTR_MISS_NEST =6 , +OVPN_NLMSGERR_ATTR_MAX =6 , +}; +/* This function is used as error callback on the netlink socket. * When something goes wrong and the kernel returns an error, this function is * invoked.
@@ -304,7 +323,7 @@ struct nlmsgerr *err, void *arg) { struct nlmsghdr *nlh = (struct nlmsghdr *)err - 1; -struct nlattr *tb_msg[NLMSGERR_ATTR_MAX +1 ]; +struct nlattr *tb_msg[OVPN_NLMSGERR_ATTR_MAX +1 ];int len = nlh->nlmsg_len;struct nlattr *attrs;int *ret = arg;
@@ -330,7 +349,7 @@ attrs = (void *)((unsigned char *)nlh + ack_len); len -= ack_len; -nla_parse (tb_msg,NLMSGERR_ATTR_MAX , attrs, len,NULL ); +nla_parse (tb_msg,OVPN_NLMSGERR_ATTR_MAX , attrs, len,NULL );if (tb_msg[NLMSGERR_ATTR_MSG ]) { len = strnlen((char *)nla_data(tb_msg[NLMSGERR_ATTR_MSG]),
@@ -339,6 +358,18 @@ (char *)nla_data(tb_msg[NLMSGERR_ATTR_MSG])); } +if (tb_msg[OVPN_NLMSGERR_ATTR_MISS_NEST ]) + { +msg (M_WARN ,"kernel error: missing required nesting type %u\n" , +nla_get_u32 (tb_msg[OVPN_NLMSGERR_ATTR_MISS_NEST ])); + } + +if (tb_msg[OVPN_NLMSGERR_ATTR_MISS_TYPE ]) + { +msg (M_WARN ,"kernel error: missing required attribute type %u\n" , +nla_get_u32 (tb_msg[OVPN_NLMSGERR_ATTR_MISS_TYPE ])); + } +return NL_STOP ; }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 10
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged